Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge_tools: enable :builtin as default diff/merge editor #2120

Merged
merged 1 commit into from
Sep 21, 2023
Merged

merge_tools: enable :builtin as default diff/merge editor #2120

merged 1 commit into from
Sep 21, 2023

Conversation

arxanas
Copy link
Collaborator

@arxanas arxanas commented Aug 19, 2023 •
edited by avamsi
Loading

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@arxanas arxanas force-pushed the arxanas/difftool-4 branch from 6e3bfd3 to d13a99e Compare August 21, 2023 00:20
@arxanas arxanas force-pushed the arxanas/difftool-5 branch from 2e7334c to 44713b4 Compare August 21, 2023 00:20
@arxanas arxanas force-pushed the arxanas/difftool-4 branch from d13a99e to 8fd121a Compare August 21, 2023 03:57
@arxanas arxanas force-pushed the arxanas/difftool-5 branch 2 times, most recently from 4052722 to bff6211 Compare August 22, 2023 04:34
@arxanas arxanas force-pushed the arxanas/difftool-4 branch from aa8f576 to 9f8c312 Compare August 23, 2023 04:20
@arxanas arxanas force-pushed the arxanas/difftool-5 branch from bff6211 to 714929c Compare August 23, 2023 04:20
@arxanas arxanas force-pushed the arxanas/difftool-4 branch from 9f8c312 to 9bd21cd Compare August 27, 2023 13:49
@arxanas arxanas force-pushed the arxanas/difftool-5 branch from 714929c to 4e3836e Compare August 27, 2023 13:49
@arxanas arxanas force-pushed the arxanas/difftool-4 branch 2 times, most recently from ddf1a50 to ec1ff78 Compare August 27, 2023 15:43
@arxanas arxanas force-pushed the arxanas/difftool-5 branch 2 times, most recently from d3da8c0 to 63dcbe2 Compare August 29, 2023 21:13
@arxanas arxanas mentioned this pull request Aug 29, 2023
Merged
4 tasks
@arxanas arxanas force-pushed the arxanas/difftool-4 branch from 3e28863 to 6a50295 Compare August 30, 2023 08:55
@arxanas arxanas force-pushed the arxanas/difftool-5 branch 2 times, most recently from 99ce2e1 to ea5692a Compare August 31, 2023 16:29
@emilykfox
Copy link
Collaborator

Sorry about the no-op looking force-push. I accidently committed a merge to this branch while trying to pull this code into my own fork.

@arxanas arxanas marked this pull request as draft September 19, 2023 04:58
Base automatically changed from arxanas/difftool-4 to main September 19, 2023 05:27
@arxanas arxanas marked this pull request as ready for review September 20, 2023 18:55
martinvonz
martinvonz approved these changes Sep 20, 2023
View reviewed changes
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@arxanas arxanas merged commit 409356f into main Sep 21, 2023
15 checks passed
@arxanas arxanas deleted the arxanas/difftool-5 branch September 21, 2023 01:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@arxanas @emilykfox @martinvonz